Merge branch 'master' of https://github.com/justbur/emacs-which-key
authorjustbur <justin@burkett.cc>
Tue, 14 Jul 2015 19:00:25 +0000 (15:00 -0400)
committerjustbur <justin@burkett.cc>
Tue, 14 Jul 2015 19:00:25 +0000 (15:00 -0400)

Trivial merge